From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 22 May 2018 11:17:38 +0000 (+0100)
Subject: lib/repo-pull: Factor out enqueue function for ScanObjectQueueData
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~23^2~28
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8b8952ebee1824162f3f282fbab0af54b1cf1eb4;p=ostree.git

lib/repo-pull: Factor out enqueue function for ScanObjectQueueData

This introduces no functional changes, but will make upcoming support
for retrying downloads easier to add.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1599
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 64035ec5..87dd322d 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -215,6 +215,8 @@ static void queue_scan_one_metadata_object (OtPullData                *pull_data
                                             guint                      recursion_depth,
                                             const OstreeCollectionRef *ref);
 
+static void queue_scan_one_metadata_object_s (OtPullData                *pull_data,
+                                              ScanObjectQueueData       *scan_data);
 static void queue_scan_one_metadata_object_c (OtPullData                *pull_data,
                                               const guchar              *csum,
                                               OstreeObjectType           objtype,
@@ -1764,6 +1766,14 @@ queue_scan_one_metadata_object (OtPullData                *pull_data,
   queue_scan_one_metadata_object_c (pull_data, buf, objtype, path, recursion_depth, ref);
 }
 
+static void
+queue_scan_one_metadata_object_s (OtPullData          *pull_data,
+                                  ScanObjectQueueData *scan_data)
+{
+  g_queue_push_tail (&pull_data->scan_object_queue, scan_data);
+  ensure_idle_queued (pull_data);
+}
+
 static void
 queue_scan_one_metadata_object_c (OtPullData                *pull_data,
                                   const guchar              *csum,
@@ -1780,8 +1790,7 @@ queue_scan_one_metadata_object_c (OtPullData                *pull_data,
   scan_data->recursion_depth = recursion_depth;
   scan_data->requested_ref = (ref != NULL) ? ostree_collection_ref_dup (ref) : NULL;
 
-  g_queue_push_tail (&pull_data->scan_object_queue, scan_data);
-  ensure_idle_queued (pull_data);
+  queue_scan_one_metadata_object_s (pull_data, g_steal_pointer (&scan_data));
 }
 
 /* Called out of the main loop to look at metadata objects which can have